fix(injection-defense): detect single-bracket [INST]/[/INST] delimiter (#353) - #373
Merged
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
gnanirahulnutakki
force-pushed
the
fix/353-inst-delimiter
branch
from
August 11, 2026 19:06
5667cd8 to
0812d2f
Compare
gnanirahulnutakki
added a commit
that referenced
this pull request
Aug 11, 2026
…uinn-proto, resync Cargo.lock (#387) Three coupled fixes that together restore a mergeable `dev`. 1. cargo-deny (required check) is failing on every open PR and on `dev` itself with a single finding: error[unmaintained]: bitmaps is unmaintained ID: RUSTSEC-2026-0247 Solution: No safe upgrade is available! `bitmaps` is transitive only, via matrix-sdk -> imbl -> imbl-sized-chunks. It is an unmaintained notice, not a vulnerability, and cargo-deny itself reports that no safe upgrade exists. That is exactly the class `[advisories].ignore` already documents (bincode via syntect, paste via fastembed, proc-macro-error2 via Matrix/Teloxide, rustls-pemfile via qdrant-client), so it is ignored on the same terms. Vulnerability advisories are still upgraded rather than ignored — see (2). 2. Patch the two crates behind all five open Dependabot alerts. Both are reachable from the workspace and both have released fixes: - russh 0.62.2 -> 0.62.5 (direct dep of crates/terminal), closing GHSA-m65r-rprj-r5rg (CVE-2026-68930, channel-scoped server callbacks reachable without an open channel), GHSA-g9hv-x236-4qp3 (pre-auth X25519 wrong-length panic), GHSA-cqjc-rmpq-xprq (post-auth pty-req panic) and GHSA-5xvq-cp9x-6p6r (pre-auth all-zero Curve25519 encode_mpint OOB). - quinn-proto 0.11.14 -> 0.11.16 (transitive), closing the one HIGH alert, GHSA-4w2j-m93h-cj5j (remote memory exhaustion from unbounded out-of-order stream reassembly). Dependabot did raise these as #385 and #382, but against `main`, where they fail DCO; `dev` never received them. 3. Resync Cargo.lock, which had drifted from the manifests: it was missing `ardur-delegate-tool` (#332) and `ardur-durability` (#327) along with tar/filetime/xattr, and still carried stale entries. `.github/workflows/release.yml` builds `--locked`, so a release cut from `dev` would have failed to resolve. `cargo metadata --locked` now succeeds. Verified locally: `cargo deny check` reports advisories/bans/licenses/ sources all ok; `cargo fmt --check`, `cargo build --workspace` and `cargo clippy --workspace --all-targets -D warnings` are clean. --- **Why this lands first:** `cargo-deny` is a required check and is currently red on *every* open PR (#368, #369, #370, #372, #373, #374, #375 all show exactly one failing required check, and it is this one). Nothing can merge into `dev` until the advisory is resolved. Signed-off-by: GR <gnanirn@gmail.com>
gnanirahulnutakki
force-pushed
the
fix/353-inst-delimiter
branch
from
August 11, 2026 19:58
0812d2f to
639fa68
Compare
#353) The delimiter_injection signature only matched the doubled [[INST]] and <|im_start|>, so the real single-bracket [INST] / [/INST] Llama/Mistral chat-template delimiter — the form an attacker actually uses to smuggle a new turn/role — passed the filter unflagged. Widen the regex to (?i)\[\s*/?\s*INST\s*\]|<\|im_start\|>|<</?SYS>>: matches [INST], [/INST], the doubled [[INST]] and internal-whitespace forms, plus the closely related Llama system delimiters <<SYS>> / <</SYS>>. Anchored to exactly INST/SYS so [INSTALL], [INSTRUCTIONS], [INFO], a[0] do not match. Add crates/injection-defense/tests/inst_delimiter_variants.rs covering both directions: the [INST] variants are now blocked as DelimiterAbuse, and representative benign bracketed text is not falsely flagged. Fixes #353 Checkpoint: architect/sessions/fix-353-inst-delimiter/journal.md Signed-off-by: Gnani Nutakki <gnani.nutakki@gmail.com> Signed-off-by: GR <gnanirn@gmail.com>
gnanirahulnutakki
force-pushed
the
fix/353-inst-delimiter
branch
from
August 11, 2026 21:23
639fa68 to
56459c7
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Root cause
crates/injection-defense/src/pattern.rs— thedelimiter_injectionsignature was
r"\[\[INST\]\]|<\|im_start\|>". The\[\[INST\]\]alternativerequires a doubled bracket, so it only fired on
[[INST]]. The delimiterattackers actually use to smuggle a new turn/role — the single-bracket
Llama/Mistral chat-template markers
[INST]and[/INST]— matched nothingand passed the filter unflagged. Verified in-tree: the other delimiter
signatures (
system_directive_delimiter,role_tag_delimiter,<|im_start|>)did not cover this form, so single-bracket
[INST]was a genuine gap.Fix
Widen the one regex to:
[INST],[/INST], the doubled[[INST]](inner match), andinternal-whitespace forms like
[ INST ].<<SYS>>/<</SYS>>that pair with
[INST].<|im_start|>(ChatML).INST/SYS+ closing bracket, so benign bracketed text—
[INSTALL],[INSTRUCTIONS],[INFO],[INSTANCE], array indexinga[0]— does not match. No false positives.Tightest possible scope: one signature line changed, no new dependencies,
Cargo.lockuntouched.Regression tests
New
crates/injection-defense/tests/inst_delimiter_variants.rs, both directions:inst_delimiter_variants_are_blocked—[INST],[/INST],[[INST]],[ INST ],<s>[INST],<<SYS>>…<</SYS>>all →Block+DelimiterAbuse.benign_bracketed_text_is_not_flagged—[INSTALL],[INSTRUCTIONS],[INFO],a[0],[INST. of Tech],[instance]all →Allow, noDelimiterAbuse.Verification (all green locally)
cargo test -p ardur-injection-defense— pass (incl. 2 new tests)cargo test -p ardur-e2e-tests— passcargo clippy -p ardur-injection-defense --all-targets -- -D warnings— cleancargo fmt --check— cleanFixes #353